types: Move GtkAdustment declaration to gtktypes.h

... and make all the headers to not include gtkadjustment.h anymore. Of
course, also include it in the source files instead.

diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c
index bdfeee3da2275cd76295873fe140462819bb2c69..9084f0e3b67a34ad4e165e0f25089c76e4cd92da 100644 (file)
--- a/gtk/a11y/gtkiconviewaccessible.c
+++ b/gtk/a11y/gtkiconviewaccessible.c
@@ -21,6 +21,7 @@
 
 #include <string.h>
 
+#include "gtk/gtkadjustment.h"
 #include "gtk/gtkiconviewprivate.h"
 #include "gtk/gtkcellrendererpixbuf.h"
 #include "gtk/gtkcellrenderertext.h"

diff --git a/gtk/deprecated/gtkcolorsel.c b/gtk/deprecated/gtkcolorsel.c
index 09d824a820aec0884c6a5368ea00efb864d08205..b9435f19330154bef443f3b5ee822269c154c054 100644 (file)
--- a/gtk/deprecated/gtkcolorsel.c
+++ b/gtk/deprecated/gtkcolorsel.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "gdk/gdk.h"
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 #include "gtkhsv.h"
 #include "gtkwindow.h"

diff --git a/gtk/deprecated/gtkhscale.c b/gtk/deprecated/gtkhscale.c
index 7aa1f3f95d03d58ea2f9554c0f6cd0e24ab22fe6..2d2882ca45cdd253fe03a150e6c626aba4425336 100644 (file)
--- a/gtk/deprecated/gtkhscale.c
+++ b/gtk/deprecated/gtkhscale.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkhscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 

diff --git a/gtk/deprecated/gtkhscrollbar.c b/gtk/deprecated/gtkhscrollbar.c
index f776b6cd7b793429063e09422a0f3e4d8a25598e..c3ad4811223f50d568f0403ba9464db1062dae60 100644 (file)
--- a/gtk/deprecated/gtkhscrollbar.c
+++ b/gtk/deprecated/gtkhscrollbar.c
@@ -25,11 +25,12 @@
 
 #include "config.h"
 
-#include "gtkscrollbar.h"
-
 #include "gtkhscrollbar.h"
-#include "gtkorientable.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtkorientable.h"
+#include "gtkscrollbar.h"
 
 
 /**

diff --git a/gtk/deprecated/gtkvscale.c b/gtk/deprecated/gtkvscale.c
index f14a06f6627a6ba03d109825997eba129f736ab8..540c36605dcbdf90f46559bdb75a692753bc2e20 100644 (file)
--- a/gtk/deprecated/gtkvscale.c
+++ b/gtk/deprecated/gtkvscale.c
@@ -28,6 +28,8 @@
 #include <stdlib.h>
 
 #include "gtkvscale.h"
+
+#include "gtkadjustment.h"
 #include "gtkorientable.h"
 
 

diff --git a/gtk/deprecated/gtkvscrollbar.c b/gtk/deprecated/gtkvscrollbar.c
index 132c355f59db60a983085287ce83b22914739cc6..e284b659da4700ae6b128c44af1ad85f5325b5cf 100644 (file)
--- a/gtk/deprecated/gtkvscrollbar.c
+++ b/gtk/deprecated/gtkvscrollbar.c
@@ -25,11 +25,12 @@
 
 #include "config.h"
 
-#include "gtkorientable.h"
-#include "gtkscrollbar.h"
-
 #include "gtkvscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtkorientable.h"
+#include "gtkscrollbar.h"
 
 
 /**

diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 894d62aea94b263bb01b7561bee9871a19cba60b..8af9685151305234a4ab22ae0be3c28d70fc53ef 100644 (file)
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -30,6 +30,7 @@
 #define __GTK_ADJUSTMENT_H__
 
 #include <gdk/gdk.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -41,7 +42,6 @@ G_BEGIN_DECLS
 #define GTK_ADJUSTMENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ADJUSTMENT, GtkAdjustmentClass))
 
 
-typedef struct _GtkAdjustment         GtkAdjustment;
 typedef struct _GtkAdjustmentPrivate  GtkAdjustmentPrivate;
 typedef struct _GtkAdjustmentClass    GtkAdjustmentClass;
 

diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c
index ead01c78c8788f1c3e011aba3a1befb63c87ab80..d1c1148b6ccf08392770d0fa47ad715e8f70e9d3 100644 (file)
--- a/gtk/gtkcellrendererspin.c
+++ b/gtk/gtkcellrendererspin.c
@@ -22,6 +22,7 @@
 
 #include "gtkcellrendererspin.h"
 
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkspinbutton.h"

diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index 32112411aafaa9b08f0767854a48e19b51780a20..c8b2d711457865813a2bf22edafb8b61b5c233fa 100644 (file)
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -19,8 +19,9 @@
 
 #include "gtkcolorplaneprivate.h"
 
-#include "gtkcolorutils.h"
 #include "gtkaccessible.h"
+#include "gtkadjustment.h"
+#include "gtkcolorutils.h"
 #include "gtkintl.h"
 
 struct _GtkColorPlanePrivate

diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index 560e892f787fc66f0e9c7035f38cd80ef4d95ab1..b9c372e514d2fb651c8495799d426ad5bbd253b0 100644 (file)
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -22,8 +22,8 @@
 #ifndef __GTK_COLOR_PLANE_H__
 #define __GTK_COLOR_PLANE_H__
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkdrawingarea.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4d8be09c047d36bda4d9b8957d4b331c9922e600..95c2deca5e1ff9f106a6f8614f05871af61815a4 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -16,7 +16,10 @@
  */
 
 #include "config.h"
+
 #include "gtkcombobox.h"
+
+#include "gtkadjustment.h"
 #include "gtkcellareabox.h"
 #include "gtktreemenu.h"
 #include "gtkarrow.h"

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 88f79b394e30e63b52920255411d83d9424f2e4b..4d5559575fbab2b5535af0a5a8d3d1419d2d4dc6 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -34,6 +34,7 @@
 #include <gobject/gobjectnotifyqueue.c>
 #include <gobject/gvaluecollector.h>
 
+#include "gtkadjustment.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtktypebuiltins.h"

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a734e22a96315ce14a8cd40fdca6ccb706372b7b..2db24889b58493cd8743e2cfd48674e51c63d441 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -31,7 +31,6 @@
 
 
 #include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index 5197d6fb1db545df4935a6c8f00bde438eeb2be6..8aa9fbf7c2ae4102818b7c2175da339eb8ea8651 100644 (file)
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -24,29 +24,27 @@
 #include <atk/atk.h>
 
 #include "gtkfontchooserwidget.h"
-#include "gtkfontchooser.h"
-#include "gtkfontchooserutils.h"
+
+#include "gtkadjustment.h"
+#include "gtkbuildable.h"
+#include "gtkbox.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
-#include "gtkframe.h"
-#include "gtkbbox.h"
-#include "gtkbox.h"
+#include "gtkgrid.h"
+#include "gtkfontchooser.h"
+#include "gtkfontchooserutils.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkliststore.h"
-#include "gtkstock.h"
-#include "gtktextview.h"
-#include "gtktreeselection.h"
-#include "gtktreeview.h"
-#include "gtkscrolledwindow.h"
-#include "gtkintl.h"
-#include "gtkaccessible.h"
-#include "gtkbuildable.h"
+#include "gtknotebook.h"
 #include "gtkprivate.h"
 #include "gtkscale.h"
+#include "gtkscrolledwindow.h"
 #include "gtkspinbutton.h"
-#include "gtknotebook.h"
+#include "gtktextview.h"
+#include "gtktreeselection.h"
+#include "gtktreeview.h"
 #include "gtkwidget.h"
-#include "gtkgrid.h"
 
 /**
  * SECTION:gtkfontchooserwidget

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 78a2b23b9978404a8242713dab42dd0b84c34124..29a31ed7661c71730088b37bf66d2b31267a08d6 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -22,6 +22,7 @@
 #include "gtkiconview.h"
 #include "gtkiconviewprivate.h"
 
+#include "gtkadjustment.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderer.h"
 #include "gtkcellareabox.h"

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index da3dc9a9c9f622bc3c0492b4b23e197444b61b73..147ea92b53cba56b5cc19f407ad5ef6997a30ef6 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -32,9 +32,10 @@
 
 #include "gdk/gdk.h"
 
-#include "gtkprivate.h"
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 
 

diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index 8ab68b502756cd12bc6fff5f3f6fef141b007fb0..f5b710e43abf2d97209b6db80e638241ef715e44 100644 (file)
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -35,7 +35,6 @@
 
 
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index b7f95e33612918db5b448ce4d51bf857683a7903..4fe6973bd67e30f6d503617881193991ac2f6092 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -95,6 +95,7 @@
 
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
 #include "gtkcheckmenuitem.h"
 #include "gtkmain.h"

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index a81b26080fa89f0c2f4507f292b1f708d677d269..d9acee88ec29e161b272e5c8dfa6d6e873f98aaf 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -28,18 +28,19 @@
 #include <stdio.h>
 #include <math.h>
 
+#include "gtkrange.h"
+
+#include "gtkadjustment.h"
+#include "gtkcolorscaleprivate.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkorientableprivate.h"
-#include "gtkrange.h"
+#include "gtkprivate.h"
 #include "gtkscale.h"
-#include "gtkcolorscaleprivate.h"
 #include "gtkscrollbar.h"
-#include "gtkwindow.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkmain.h"
 #include "gtktypebuiltins.h"
+#include "gtkwindow.h"
 #include "a11y/gtkrangeaccessible.h"
 
 /**

diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index c4d9e9eb0cd318b6d4dd80ecd848b179f96d84f4..99bbb7d3be69bd18a386ab030e0f82f2544584b0 100644 (file)
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -30,7 +30,6 @@
 #define __GTK_RANGE_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkwidget.h>
 
 

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 22b7128788ef0d11149daccacb621581a2194fc9..25c5a44e55771410546244b5d23a4b7fc0e888f6 100644 (file)
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -29,16 +29,18 @@
 #include <stdlib.h>
 
 #include "gtkscaleprivate.h"
+
+#include "gtkadjustment.h"
+#include "gtkbindings.h"
+#include "gtkbuildable.h"
+#include "gtkbuilderprivate.h"
 #include "gtkiconfactory.h"
 #include "gtkicontheme.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtkbindings.h"
 #include "gtkorientable.h"
-#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
-#include "gtkbuildable.h"
-#include "gtkbuilderprivate.h"
+#include "gtktypebuiltins.h"
 
 #include "a11y/gtkscaleaccessible.h"
 

diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index b91c6792cb0d607120e6a0a2482ca3d3c4a9fec9..43055ea225db204428136cb95c59f4266afc817c 100644 (file)
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -33,6 +33,8 @@
 
 #include "config.h"
 
+#include "gtkscalebutton.h"
+
 #ifndef _WIN32
 #define _GNU_SOURCE
 #endif
@@ -40,6 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
 #include "gtkframe.h"
 #include "gtkmain.h"
@@ -47,7 +50,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkscale.h"
-#include "gtkscalebutton.h"
 #include "gtkstock.h"
 #include "gtkbox.h"
 #include "gtkwindow.h"

diff --git a/gtk/gtkscrollable.c b/gtk/gtkscrollable.c
index 8c08cdf4e018b2d384b62c70bf72d5a83461bcb1..3c7c76fcc65bba057c27b8a51d6ca198927755c8 100644 (file)
--- a/gtk/gtkscrollable.c
+++ b/gtk/gtkscrollable.c
@@ -69,6 +69,8 @@
 #include "config.h"
 
 #include "gtkscrollable.h"
+
+#include "gtkadjustment.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index f2774be68521b5a8fb562d4120bea9ef32f9d261..ba68e90f7602adf95ae6d490e226988983c15d5f 100644 (file)
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -22,8 +22,8 @@
 #ifndef __GTK_SCROLLABLE_H__
 #define __GTK_SCROLLABLE_H__
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 

diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 78d46a89f01f2dcaea5b66cc7e9cdf95e5de07b0..eb5ee5a8267ad7be60ea4475ae3a953e34729a40 100644 (file)
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -26,6 +26,8 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 05bad81533734de7ef4c72f92adbfe5966fa3dd7..dd4b71f9cab102666425148877b4ebbf55e6f8d2 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -24,24 +24,25 @@
 
 #include "config.h"
 
-#include <math.h>
+#include "gtkscrolledwindow.h"
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkmarshalers.h"
-#include "gtkscrollable.h"
-#include "gtkscrollbar.h"
-#include "gtkscrolledwindow.h"
-#include "gtkwindow.h"
-#include "gtkviewport.h"
 #include "gtkdnd.h"
+#include "gtkintl.h"
 #include "gtkmain.h"
+#include "gtkmarshalers.h"
 #include "gtkprivate.h"
+#include "gtkscrollable.h"
+#include "gtkscrollbar.h"
 #include "gtktypebuiltins.h"
-#include "gtkintl.h"
 #include "gtkviewport.h"
 #include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
 #include "a11y/gtkscrolledwindowaccessible.h"
 
+#include <math.h>
+
 /**
  * SECTION:gtkscrolledwindow
  * @Short_description: Adds scrollbars to its child widget

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index e3caddff84bd14549b2f44a79c57bf7b8d599df8..69a77e3c9460a58b893b7d0bed977ca7bd438b9e 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -27,14 +27,16 @@
 
 #include "config.h"
 
+#include "gtkspinbutton.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <locale.h>
 
+#include "gtkadjustment.h"
 #include "gtkbindings.h"
-#include "gtkspinbutton.h"
 #include "gtkentryprivate.h"
 #include "gtkicontheme.h"
 #include "gtkmarshalers.h"

diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index f71c5b42e98282a1557e31c88314fa953c90859b..362c4d56b4e73fb4d20897e4c8c4f234c65fa7a7 100644 (file)
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -34,7 +34,6 @@
 
 
 #include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c22eeb1bcc786b96e5b969c3a500e3ffe15d1cbc..97d5cb6a8e8f19db1d7b7b5cd26476b28a5a964d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -22,6 +22,8 @@
 #include <string.h>
 
 #include "gtktreeview.h"
+
+#include "gtkadjustment.h"
 #include "gtkrbtree.h"
 #include "gtktreednd.h"
 #include "gtktreeprivate.h"

diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index a14457879af515ab8e5e668d53aaad787b6ba6f6..b3eade30a5a2e37b242d5e64bffa14be92d56b87 100644 (file)
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -31,6 +31,7 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GtkAdjustment          GtkAdjustment;
 typedef struct _GtkClipboard          GtkClipboard;
 typedef struct _GtkIconSet             GtkIconSet;
 typedef struct _GtkIconSource          GtkIconSource;

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index eea91ad9aec30f578dca5ccccc2c5862477e276e..4829cde5e8913a14051adac7b37bb166b949127b 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -26,11 +26,12 @@
 
 #include "gtkviewport.h"
 
+#include "gtkadjustment.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkscrollable.h"
 #include "gtktypebuiltins.h"
-#include "gtkprivate.h"
 
 
 /**

diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 50ea6b0badcb2fada3cb9618cb9a3e80866eb3f1..68aaa857b6263efb0139db826d7e14ad5eee156d 100644 (file)
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -30,7 +30,6 @@
 #define __GTK_VIEWPORT_H__
 
 
-#include <gtk/gtkadjustment.h>
 #include <gtk/gtkbin.h>
 
 

diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index e04fd4cff373a707da50842d584e852c86ab8c48..823d1decbfa2c1b1f02b512e621763a262acf8fb 100644 (file)
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -28,9 +28,10 @@
 #include "config.h"
 
 #include "gtkvolumebutton.h"
-#include "gtkstock.h"
-#include "gtktooltip.h"
+
+#include "gtkadjustment.h"
 #include "gtkintl.h"
+#include "gtktooltip.h"
 
 
 /**